Make it compile without mmap() and add some more checks. (#155973, Morten

2004-10-21  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconcache.c: Make it compile without mmap() and
	add some more checks.  (#155973, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 78291168984b7284e1f43be60643688cc4ff1625..00a191de9f615a537dffc1d94b590e03f5a5ec34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Make it compile without mmap() and
+       add some more checks.  (#155973, Morten Welinder)
+
        Add convenience api for image dnd (#150165):
        
        * gtk/gtkselection.h: 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 78291168984b7284e1f43be60643688cc4ff1625..00a191de9f615a537dffc1d94b590e03f5a5ec34 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Make it compile without mmap() and
+       add some more checks.  (#155973, Morten Welinder)
+
        Add convenience api for image dnd (#150165):
        
        * gtk/gtkselection.h: 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 78291168984b7284e1f43be60643688cc4ff1625..00a191de9f615a537dffc1d94b590e03f5a5ec34 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Make it compile without mmap() and
+       add some more checks.  (#155973, Morten Welinder)
+
        Add convenience api for image dnd (#150165):
        
        * gtk/gtkselection.h: 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 78291168984b7284e1f43be60643688cc4ff1625..00a191de9f615a537dffc1d94b590e03f5a5ec34 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-10-21  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconcache.c: Make it compile without mmap() and
+       add some more checks.  (#155973, Morten Welinder)
+
        Add convenience api for image dnd (#150165):
        
        * gtk/gtkselection.h: 

diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
index 766dfa0e237e4191cc3a09d1f6aba5d3f1e49e7d..7aca03eac09c0542af8e93d3d9338b022d15e6b0 100644 (file)
--- a/gtk/gtkiconcache.c
+++ b/gtk/gtkiconcache.c
@@ -21,7 +21,10 @@
 #include "gtkdebug.h"
 #include "gtkiconcache.h"
 
+#ifdef HAVE_MMAP
 #include <sys/mman.h>
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #ifdef HAVE_UNISTD_H
@@ -60,8 +63,9 @@ _gtk_icon_cache_unref (GtkIconCache *cache)
     {
       GTK_NOTE (ICONTHEME, 
                g_print ("unmapping icon cache\n"));
-
+#ifdef HAVE_MMAP
       munmap (cache->buffer, cache->size);
+#endif
       g_free (cache);
     }
 }
@@ -73,7 +77,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   gint fd;
   struct stat st;
   struct stat path_st;
-  gchar *buffer;
+  gchar *buffer = MAP_FAILED;
   GtkIconCache *cache = NULL;
 
   if (g_getenv ("GTK_NO_ICON_CACHE"))
@@ -85,21 +89,19 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   GTK_NOTE (ICONTHEME, 
            g_print ("look for cache in %s\n", path));
 
-  if (!g_file_test (cache_filename, G_FILE_TEST_IS_REGULAR))
-    {
-      g_free (cache_filename);
-      return NULL;
-    };
-
   /* Open the file and mmap it */
   fd = open (cache_filename, O_RDONLY);
 
-  g_free (cache_filename);
-  
   if (fd < 0)
-    return NULL;
+    {
+      g_free (cache_filename);
+      return NULL;
+    }
   
-  if (fstat (fd, &st) < 0)
+  if (!g_file_test (cache_filename, G_FILE_TEST_IS_REGULAR))
+    goto done;
+
+  if (fstat (fd, &st) < 0 || st.st_size < 4)
     goto done;
 
   if (stat (path, &path_st) < 0)
@@ -113,7 +115,9 @@ _gtk_icon_cache_new_for_path (const gchar *path)
       goto done; 
     }
 
-  buffer = mmap (0, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+#ifdef HAVE_MMAP
+  buffer = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
+#endif
 
   if (buffer == MAP_FAILED)
     goto done;
@@ -122,7 +126,9 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   if (GET_UINT16 (buffer, 0) != MAJOR_VERSION ||
       GET_UINT16 (buffer, 2) != MINOR_VERSION)
     {
+#ifdef HAVE_MMAP
       munmap (buffer, st.st_size);
+#endif
       GTK_NOTE (ICONTHEME, 
                g_print ("wrong cache version\n"));
       goto done;
@@ -137,6 +143,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
   cache->size = st.st_size;
   
  done:
+  g_free (cache_filename);  
   close (fd);
 
   return cache;